projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a6cc97
)
Fix typo in previous smerge-mode-map change
author
Lars Ingebrigtsen
<larsi@gnus.org>
Wed, 20 Oct 2021 09:49:22 +0000
(11:49 +0200)
committer
Lars Ingebrigtsen
<larsi@gnus.org>
Wed, 20 Oct 2021 09:49:22 +0000
(11:49 +0200)
* lisp/vc/smerge-mode.el (smerge-mode-map): Fix typo (bug#51303).
lisp/vc/smerge-mode.el
patch
|
blob
|
history
diff --git
a/lisp/vc/smerge-mode.el
b/lisp/vc/smerge-mode.el
index 0be1a03c650a1c19b0bff9ef1b3544efa749b89a..2cc5ee739fd3132e806aed2e4c80c739dbd86166 100644
(file)
--- a/
lisp/vc/smerge-mode.el
+++ b/
lisp/vc/smerge-mode.el
@@
-170,7
+170,7
@@
Used in `smerge-diff-base-upper' and related functions."
string))
(defvar-keymap smerge-mode-map
- smerge-command-prefix
'
smerge-basic-map)
+ smerge-command-prefix smerge-basic-map)
(defvar-local smerge-check-cache nil)
(defun smerge-check (n)